firmware_class: Log every success and failure against given device

The hundreds of users of request_firmware() have nearly as many
different log formats for reporting failures.  They also have only the
vaguest hint as to what went wrong; only firmware_class really knows
that.  Therefore, add specific log messages for the failure modes that
aren't currently logged.

In case of a driver that tries multiple names, this may result in the
impression that it failed to initialise.  Therefore, also log successes.

This makes many error messages in drivers redundant, which will be
removed in later patches.

This does not cover the case where we fall back to a user-mode helper
(which is no longer enabled in Debian).

NOTE: hw-detect will depend on the "firmware: failed to load %s (%d)\n"
format to detect missing firmware.

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name firmware_class-log-every-success-and-failure.patch

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 7dd36ace615204c0ecf60ca43aa238b8392d5a3b..cd5763e1245101f8c98d8d02019b2bd8bf35886c 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -443,21 +443,22 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv)
                rc = kernel_read_file_from_path(path, &fw_priv->data, &size,
                                                msize, id);
                if (rc) {
-                       if (rc == -ENOENT)
-                               dev_dbg(device, "loading %s failed with error %d\n",
-                                        path, rc);
-                       else
-                               dev_warn(device, "loading %s failed with error %d\n",
-                                        path, rc);
+                       dev_dbg(device, "loading %s failed with error %d\n",
+                               path, rc);
                        continue;
                }
-               dev_dbg(device, "direct-loading %s\n", fw_priv->fw_name);
+               dev_info(device, "firmware: direct-loading firmware %s\n",
+                        fw_priv->fw_name);
                fw_priv->size = size;
                fw_state_done(fw_priv);
                break;
        }
        __putname(path);
 
+       if (rc)
+               dev_err(device, "firmware: failed to load %s (%d)\n",
+                       fw_priv->fw_name, rc);
+
        return rc;
 }
 
@@ -1120,7 +1121,7 @@ static int fw_load_from_user_helper(struct firmware *firmware,
        if (opt_flags & FW_OPT_NOWAIT) {
                timeout = usermodehelper_read_lock_wait(timeout);
                if (!timeout) {
-                       dev_dbg(device, "firmware: %s loading timed out\n",
+                       dev_err(device, "firmware: %s loading timed out\n",
                                name);
                        return -EBUSY;
                }